mwan3: add locking debug possibility

Signed-off-by: Florian Eckert <[email protected]>

diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
index 55d0aa20dcbc3916a77ab1172dd4a27903f83932..65b99c1bdee061bf865d1a3e575c5e0dd9d14d37 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -16,11 +16,11 @@ config_load mwan3
 config_get_bool enabled globals 'enabled' '0'
 [ ${enabled} -gt 0 ] || exit 0
 
-mwan3_lock
+mwan3_lock "$ACTION" "$INTERFACE"
 mwan3_init
 mwan3_set_connected_iptables
 mwan3_set_custom_ipset
-mwan3_unlock
+mwan3_unlock "$ACTION" "$INTERFACE"
 
 config_get enabled $INTERFACE enabled 0
 config_get initial_state $INTERFACE initial_state "online"
@@ -58,7 +58,7 @@ else
        running=1
 fi
 
-mwan3_lock
+mwan3_lock "$ACTION" "$INTERFACE"
 $LOG notice "Execute "$ACTION" event on interface $INTERFACE (${DEVICE:-unknown})"
 
 case "$ACTION" in
@@ -91,6 +91,6 @@ case "$ACTION" in
        ;;
 esac
 
-mwan3_unlock
+mwan3_unlock "$ACTION" "$INTERFACE"
 
 exit 0

diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3
index d2d148bafabba16ca6c7a4cc3d6c258442985d81..15a8ae5f15c657db840e1855a38aaa8c98577357 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3
@@ -9,9 +9,9 @@ config_get_bool enabled globals 'enabled' '0'
 [ ${enabled} -gt 0 ] || exit 0
 
 if [ "$ACTION" == "ifup" ]; then
-       mwan3_lock
+       mwan3_lock "$ACTION" "mwan3rtmon"
        mwan3_rtmon
-       mwan3_unlock
+       mwan3_unlock "$ACTION" "mwan3rtmon"
 fi
 
 exit 0

diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh
index d28ab28e2f20b66c2173a06411dc9607e09f1ae3..a3343739b682008b4bea7b81324c776aa88b0cf0 100644 (file)
--- a/net/mwan3/files/lib/mwan3/mwan3.sh
+++ b/net/mwan3/files/lib/mwan3/mwan3.sh
@@ -163,9 +163,11 @@ mwan3_init()
 
 mwan3_lock() {
        lock /var/run/mwan3.lock
+#      $LOG debug "$1 $2 (lock)"
 }
 
 mwan3_unlock() {
+#      $LOG debug "$1 $2 (unlock)"
        lock -u /var/run/mwan3.lock
 }
 

diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3
index fa8f0a4d503db5356e73efe6dbaafbf9c8fde76c..ef8b851f2dc2704dab3771436b46f3900cd58e22 100755 (executable)
--- a/net/mwan3/files/usr/sbin/mwan3
+++ b/net/mwan3/files/usr/sbin/mwan3
@@ -136,7 +136,7 @@ stop()
 {
        local ipset route rule table IP IPT pid
 
-       mwan3_lock
+       mwan3_lock "command" "mwan3"
 
        for pid in $(pgrep -f "mwan3rtmon"); do
                kill -TERM "$pid" > /dev/null 2>&1
@@ -186,7 +186,7 @@ stop()
                $IPS -q destroy $ipset
        done
 
-       mwan3_unlock
+       mwan3_unlock "command" "mwan3"
 
        mwan3_lock_clean
        rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR

diff --git a/net/mwan3/files/usr/sbin/mwan3rtmon b/net/mwan3/files/usr/sbin/mwan3rtmon
index f8e6ec081b748104e46ada652e374ee156fd526b..f68c298cd0b95e128fea02de0797ef8ed26432f1 100755 (executable)
--- a/net/mwan3/files/usr/sbin/mwan3rtmon
+++ b/net/mwan3/files/usr/sbin/mwan3rtmon
@@ -24,15 +24,15 @@ main() {
 
        sleep 3
        while true; do
-               mwan3_lock
+               mwan3_lock "service" "mwan3rtmon"
                [ mwan3_remon_ipv4 = "1" ] || \
                [ mwan3_rtmon_ipv6 = "1" ] && break
-               mwan3_unlock
+               mwan3_unlock "service" "mwan3rtmon"
                [ "$rtmon_interval" = "0" ] && break
                sleep "$rtmon_interval" &
                wait
        done
-       mwan3_unlock
+       mwan3_unlock "service" "mwan3rtmon"
 }
 
 main "$@"